Fixing Conflict Issues/ Conflicts because of Rem
working?