change
Merge pull request #1 from efatih/test-git

change
Formatting
Solve conflicts