Inconsistent merge state: could not find file MERGE_MSG in .git folder.
This file contains the commit message for a merge commit.

wat