Write more documentation
Fix merge conflicts