first terminal commit
without conflicts