correcting merge problem