new branch "new"
adding more to "new" branch
Merged master fixed conflict.
Fixed merge conflict