fixing compile error from the selective merge