Resolving merge artifacts