Draft Git Resolve Conflicts