conflict resolve
css fix
simple model additions
css fix
operations can be added