add org config
fix conflicts