fixing conflict
strReplace added to library
fix conflicts
fix conflicts ...