1.0.2 Bump
Ensure merge takes precedence over flat if true

Fix #7
1.0.2 Release