Github Web Editor Resolve Conflicts