correcting merge changes