install, publish functionality in progress
conflicts fixed