starting on github search
fix merge conflicts