first commit
commit before pull.
Confict fixed