red brackets added
fixed conflicts