remove conflict lines in the merging of UF-115
Merge pull request #114 from Webcraft-Myplanet/UF-fix1

remove conflict lines in the merging of UF-115