first commit merge