WTF? Fix conflicts and code changes