Cleanup
Fix merge conflict