first commit
committing files
resolving merge conflicts