Hopefully I fixed all merge conflicts