Fixed a missing comma error caused by incorrect conflict resolution