bug fixed
conflicts resolved