Fix Tyler's conflicts