Revert some changes to resolve conflicts one by one