Resolve editor default conflicts