corrected merge istakes

corrected merge istakes