Mild Conflict Resolution

Minor update to get rid of conflict garbage