Fix merging errors for magit