code improvements
fixed merged file issue
code improvements