Unresolved merge conflict got committed

This removes it