fix commit conflict