fix bad confict merge