Fixed svn merge error
Removed temp files