Made query live
resolve conflict