merge git problem