merge first commit for locked CM10