Clean up
Fix conflicts