Hopefully I fixed the merge issues