add listings controller and model
fixed conflicts