merging problem

new_bulk.html.erb

<%= breadcrumbs([@campaign.client_advertiser, @campaign, :creatives, :bulk]) %>

<div class = "page-header">
    <h2><%= @campaign.name %>: Create Multiple Creatives</h2>
</div>

<%= form_for(@creative, :url => bulk_create_campaign_creatives_url(@campaign), :html => {:class => "form-horizontal"}) do |f| %>

    <%= f.error_messages :class => "alert alert-error span10"   %>

    <div class="clear">

        <div class="control-group">
            <%= label_tag :ad_groups, "Ad Groups", :class => "control-label" %>
            <div class ="controls">
                <%= select_tag "ad_groups_ids[]", options_from_collection_for_select(@campaign.ad_groups, 'id', 'name', @bulk_ad_group_ids), {"data-placeholder" => "Choose Ad Groups ", "data-no_results_text" => "No such Ad Group                    found", :style => "min-width:600px", :multiple => true } %>
            </div>
        </div>

        <div class="control-group">
            <%= label_tag :base_name, "Base Name", :class => "control-label" %>
            <div class ="controls">
                <%= text_field_tag :base_name, params[:base_name] %>
            </div>
        </div>

        <div class="control-group">
            <%= f.label :active, "Active", :class => "control-label" %>
            <div class ="controls">
                <%= f.check_box :active %>
            </div>
        </div>

<<<<<<< HEAD
			<%= f.label :size, "Creative Size:", :class => "control-label" %>
			<div style="clear:both"></div>

			<div class = "offset">
		<% Creative::SIZES.each do |creative_size| %>
				<%= creative_checkbox(creative_size) %>
		<% end %>
		</div>
		
		<div id='format_group_tag'>		
				<h4>Tags</h4>
    	<% Creative::SIZES.each do |creative_size| %>
        <div id=<%= "tags_#{creative_size}" %>>
					<div class="control-group">
            <%= label_tag sanitize_to_id("tags_#{creative_size}"), creative_size, :class => "control-label" %>
						<div class="controls">
 							<%= text_area_tag "tags[#{creative_size}]", tag_field_value(creative_size), {:id => sanitize_to_id("tags_#{creative_size}"), :class => "input-xlarge tag_field"} %>
						</div>
					</div>
				</div>
      <% end %>
	  </div>

<div id='format_group_url'>
    <h4>Urls</h4>
    <% Creative::SIZES.each do |creative_size| %>
        <div id=<%= "urls_#{creative_size}" %>>
					<div class="control-group">
           		<%= label_tag sanitize_to_id("urls_#{creative_size}"), creative_size, :class => "control-label" %>
							<div class="controls">
           		<%= text_field_tag "urls[#{creative_size}]", tag_field_value(creative_size), {:id => sanitize_to_id("urls_#{creative_size}"), :class => "input-xlarge url_field" } %>
							</div>
=======
        <div class="control-group">
            <%= f.label :format, "Creative Format", :class => "control-label" %>
            <div class ="controls">
                <%= f.select :format, Creative::FORMATS %>
            </div>
>>>>>>> 58c4386... [#31824401] - refactored quick nav, introduced campaigns_management layout, views code cleanup
        </div>

        <div class="control-group">
            <%= f.label :tag_type, "Tag Type", :class => "control-label" %>
            <div class ="controls">
                <% Creative::TAG_TYPES.each do |t_type| %>
                    <label class="radio">
                        <%= f.radio_button :tag_type, t_type %> <%= t_type %>
                    </label>
                <% end %>
            </div>
        </div>

        <div class="control-group">
            <%= f.label :convert_to_pixalate, "Include Pixalate Tag", :class => "control-label" %>
            <div class ="controls">
                <%= f.check_box :convert_to_pixalate %>
            </div>
        </div>


        <%= f.label :size, "Creative Size:", :class => "control-label" %>
        
        <div style="clear:both"></div>

        <div class = "offset">
            <% Creative::SIZES.each do |creative_size| %>
                <%= creative_checkbox(creative_size) %>
            <% end %>
        </div>
        
        <div id='format_group_tag'>     
            <h4>Tags</h4>
            <% Creative::SIZES.each do |creative_size| %>
            <div id="<%= "tags_#{creative_size}" %>">
                <div class="control-group">
                    <%= label_tag sanitize_to_id("tags_#{creative_size}"), creative_size, :class => "control-label" %>
                    <div class="controls">
                        <%= text_area_tag "tags[#{creative_size}]", tag_field_value(creative_size), {:id => sanitize_to_id("tags_#{creative_size}"), :class => "input-xlarge"} %>
                    </div>
                </div>
            </div>
            <% end %>
        </div>

        <div id='format_group_url'>
            <h4>Urls</h4>
            <% Creative::SIZES.each do |creative_size| %>
            <div id="<%= "urls_#{creative_size}" %>">
                <div class="control-group">
                    <%= label_tag sanitize_to_id("urls_#{creative_size}"), creative_size, :class => "control-label" %>
                    <div class="controls">
                        <%= text_field_tag "urls[#{creative_size}]", tag_field_value(creative_size), {:id => sanitize_to_id("urls_#{creative_size}"), :class => "input-xlarge" } %>
                    </div>
                </div>
            </div>
            <% end %>
        </div>

        <div class = "form-actions">
            <%= f.submit 'Create', :class=>"btn btn-primary" %>  <%= link_to 'Cancel', client_advertiser_campaign_path(@campaign.client_advertiser,@campaign), :class=>"btn"  %>
        </div>
    </div>
<% end #end of the form %>

<script type="text/javascript">
    new Chosen($('ad_groups_ids_'),{
      allow_single_deselect: false
    });

    function switch_format_group(switch_el)
    {
        switch_el = switch_el || $('creative_format');
        if (switch_el.value === '3rd Party URL') {
            $('format_group_tag').hide();
            $('format_group_url').show();
            $$('.tag_field').each(function(field) {
            	field.clear();
            });
        }
        else if (switch_el.value === '3rd Party Tag') {
            $('format_group_url').hide();
            $('format_group_tag').show();
            $$('.url_field').each(function(field) {
            	field.clear();
            });
        }

    }

    function set_tag_field_visibility(switch_el)
    {
        if (switch_el.checked) {
            $('urls_'+switch_el.value).show();
            $('tags_'+switch_el.value).show();
        } else {
            $('urls_'+switch_el.value).hide();
            $('tags_'+switch_el.value).hide();
        }
    }

    switch_format_group();
    
    $('creative_format').observe('change', function(evt){
        var el = evt.element();
        switch_format_group(el);
    });

    $$('.creative_size_checkbox').each(function(el){
        set_tag_field_visibility(el);
        el.observe('click', function(evt){
            var el = evt.element();
            set_tag_field_visibility(el);
        });
    });
</script>