commit problem
fix conflicts