Ignore conflicts here as well as they come from double clicks