first stable release
conflict resolution