Git Error On Commit After Merge - Fatal: Cannot Do A Partial Commit During A Merge