Resolving merge conflict.