100% less C++11 :-(
Fixed merge conflict