Constraints, phone null issue fix
conflict and bug fixes