Quick search
resolved merge conflicts