Resolve merge conflicts.
flycheck: Setup.