fixes fixes everywhere
conflicts