merge compilation issues fixed