override merge fixes