Adding section to readme on conflicts
Instead of blindly calling `git add` / `git rm`, check for changes first