Fixed search
Conflict merge