fixed errors due to merging