handle merge conflicts from master