fix git conflic