Git Remote branch Merge Conflict

NoSuchKey