more attempts
fixed conflicts