fixed config errors due to merge with develop