Make open changes conflicting

@charlierudolph this implements #176. What do you think?