Resolving Git Merge Conflicts when using Squash and Merge with Git(00) Save Image Image gallery: Paris Hitlon Sex Tape