Cleaned up conflicts, fixed menu. Removed token message from build
inventory