Removed hackfix test.
Fixed merge conflict