Git merge improvements and aliases