random changes
fixed conflicts