.aliases - fix conflict
Update fork
Retain changes from my side