cleaned all the mess
fixed conflicts