removed conflicting control files