Stable'
resolve conflicting merges