fix files controller merge error