fixing broken aliases
fixing base merge