branch commit
conflict resolving