Cleanup
Solve merge conflicts