commit before merging ...
commit after merging with meld several changes to try to improve performance ...