POSH wanted me to Commit before Merging
Solving Merge Errors