Preventing conflict with merge