remove clutter from merge conflict
add validations when creating leads