fix weird merge