Fine with me. Git should be able to sort out the conflicts, if not I can when I do the next mergeup.