Models modified
Controllers modified
conflict resolved