First commit
Conflict after linking local with remote repositories