Commit merge problem