small project
first commit
Resolving conflict