Fixed a couple of bugs with confirmed
Fixed conflict