fix comp. error due to merge