Revert automatic merge