Martins done some magics
Fixed merge conflict thingamajig yao