Fun with MSVC
conflict fixed