After the git conflict