Updated merge function with git aliases.