Updated dialog file
Fixed merge conflict
Fixed M4 breaking changes