first commit of merge