Cause merge conflict for Joshua