Simple merge, Just copy the non-conflict file