first commmit
Git ignore
Merge commit