Quick fix after wrong conflict resolution