Correcting merge problem