conflict commit on new machine
commit pull from new machine