I hope this works
Fixed conflicts