Found a few missing merge conflict tags