controller file conflicts resolved