tabs re coded
conflicts resolved