Need macro/formula for copy/paste between filtered workbooks

Hi all,

I have a report which needs to be updated on a daily basis. We work on it in pairs, where one of us updates dates in column O for some lines and the other one updates order statuses in columns M, N and O for other lines. We use filters for that and afterwards need to combine the two files before we send it back to the customer. Can anyone suggest a solution on how to combine the files without having the data overwritten? After some searching, I figured it might require a macro, but I don't have enough Excel knowledge to create one. Any help would be much appreciated.

I have attached the file with a portion of the data now, we both work on a copy of it. One needs to update columns M, N and O for all lines that have "Yes" in column P, and the other one updates only column O for all the rest.