Reformatted checked out report layout
fixed conflicts