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

Mines not working but merge is complete