Fixed merge stufF