Nothing major
Fixed merge conflicts