Step revision to 3.10
Resolve Merge issues