Correcting merge commit