Resolving merge issue