finished testTargets
fixed conflicts