New functions and aliases
Git add and commit all and prettier conflicstyle