Fix Merge Conflict leftovers