fixed install directory
conflict resolution bot