making the install script better and more effective
fixing conflicts