Merge conflict resolution
Convert Insitution form to simple_form