made a change
manualy resolving conflict
Merge pull request #1 from broinjc/new

New