Git Please Commit Your Changes Before Merging Two