Fixed conflicts between controller/model files