Fixed wrong resolved conflict after merge