Resolving some conflicts with merge.