Oops, merging conflicts correctly this time