Removed an accidentally committed merge conflict
[minor] CS fixes: whitespace
Added startsWith function for string wrappers