Clean up after fixing merge conflicts