remove left overs from merge--fix build