Clear merge changes and build