Resolving merge.