Fixed merge conflict junk