What if our applications and data could live on our devices, but without sacrificing the collaboration we’ve come to expect, and without losing easy access to our data from all of our devices? Pixelpusher is a drawing application with real-time collaboration built-in. In Pixelpusher, merging work often results in conflicts: if two users think a pixel should have different colors, the situation is likely to require explicit resolution by a user, but until it is resolved, we can still pick one value or another to show in the application.