anchor.diff:  	    ],
       Expected = [Q#riak_sql_v1{is_executable = true,
                                 type          = timeseries,
  -<<<<<<< HEAD
  -                              'WHERE'       = [
  -                                               {startkey, [
  -                                                           {<<"time">>,
  -							    timestamp,
  -							    3000},
  -                                                           {<<"user">>,
  -							    binary,
  -							    <<"user_1">>}
  -                                                           ]},
  -                                               {endkey,   [
  -                                                           {<<"time">>,
  -							    timestamp,
  -							    5000},
  -                                                           {<<"user">>,
  -							    binary,
  -							    <<"user_1">>}
  -                                                          ]},
  -                                               {filter,   []}
  -                                              ],
  -=======
                                 'WHERE'       = Where,
  ->>>>>>> 74fd24c9054bed9f6c416c5f9b89e7adca850fa0
                                 partition_key = get_standard_pk(),
                                 local_key     = get_standard_lk()
                        }],
  
positive.code:     true = is_query_valid(DDL, Q),
      Got = compile(DDL, Q),
      Where = [
  <<<<<<< HEAD
  	     {startkey, [
  			 {<<"time">>, timestamp, 3000},
  			 {<<"user">>, binary,    <<"user_1">>}
  			]},
  	     {endkey,   [
  			 {<<"time">>, timestamp, 5000},
  			 {<<"user">>, binary,    <<"user_1">>}
  			]},
  	     {filter,   {and_,
  			 {or_,
  			  {'=', {field, <<"weather">>, binary},
  			   {const, <<"yankee">>}},
  			  {and_,
  			   {'=', {field, <<"geohash">>,     binary},
  			    {const, <<"erko">>}},
  			   {'=', {field, <<"temperature">>, binary},
  			    {const, <<"yelp">>}}
  			  }
  			 },
  			 {'=', {field, <<"extra">>, integer},
  			  {const, 1}}
  			}
  	     }
  =======
  	     {startkey,        [
  				{<<"time">>, timestamp, 3000},
  				{<<"user">>, binary,    <<"user_1">>}
  
negative.code:     true = is_query_valid(DDL, Q),
      Got = compile(DDL, Q),
      Where = [
  	     {startkey,        [
  				{<<"time">>, timestamp, 3000},
  				{<<"user">>, binary,    <<"user_1">>}
  