-- changed diff format
-- using patch instead of git apply