added additional user columns
fixed conflicts