better user
fix conflicts