using Ilias solution, fixed join table issue on local
fixed merge issues
removed extraneous model