Resolved conflicts
DEBUG BUTTON