Merged stuff, no conflicts but the mines don't seem to be working...