Fix bad merge, broken tags