Added the one -M argument to the diff in merge action