Fixed merge conflict due to trailing white spaces in 00-CompletedTEmplateList.xsls