coding standards
fix conflicts