fixed issues left over from merge