fixing bugs
conflicts resolved