init4flymake added
conflict modified