Mid Version Control Manually edit the file to keep the correct code.? Mark conflicts as resolved: git add <filename> git commit