Non-conflicting merge