fixed typo in mountrpi alias
fixed .bashrc merge conflict