In class code changes
fix conflicts