update to newest build
conflicts resolved