+ fixed annoying conflict markers