pushing
conflict resolved
created compilations controller, view, show