Merge conflicts part 3
Merge conflicts part 3-2
Merge conflicts still occur w/ branches
Avoiding merge conflicts
More avoiding merge conflicts
Merge branch 'branchTwo' into branchOne
Go back to previous commit
Revert "Merge branch 'branchTwo' into branchOne"

This reverts commit 7b45f325e2569a9d8a7f48f65255e1bde630c363, reversing
changes made to f32c6f7d38d0e1995fb9addcc498fb3b97405aa2.
Revert "Revert "Merge branch 'branchTwo' into branchOne""

This reverts commit 4e16e753726f911e3c3f7740c0ca67efc6b09c27.
Revert "Go back to previous commit"

This reverts commit c8555e7e493204d084baa76d0da2fbcd020d3145.

Does this get rid of unwanted line?
Merge branch 'master' of https://github.com/mandarker/pretty-swag into branchOne
Change on branch one