merge conf and req from docs branch