Fixed leftover merge text that was causing compilation problems.
Fixed leftover merge text that was causing compilation problems.