content changes after client review
fixed conflicts