Fixed Git conflict issues

Fixed Git conflict issues