controller and model drafts
controlelr and model drafts
properly merge