Code editor now showing all statements
Fixing merge conflict (dang it all)