fixed few mistakes done while merging