Removed merge conflict junk