Fix for previous bad conflict resolution