fixed brocfile after merge