add aliases
fix conflicts