Add project files to git repository
Fix merged conflicts