bug bix for production
fixed merge error
Removed empty line