merge conflict #4 VS2012
merge between conflicts
yet another merge conflict commit