add api documentation in separate file
fix merge conflicts