attempting to fix merge conflict...
fixed aliases