resolving conflicts to reset to w02 code