looks like i somehow missed some conflicts so should be good now