merge amisha changes