validating phone
fix conflicts