fixxed errors due to merging