fixed merge conflicts in compile doc