How To Resolve Git Merge Conflict Vs Code