Finishing up
Fixed merge and stuff