Revert last commit, conflicts