cleaned up example code a bit
fixed merge conflict