Fixing conflicts in merge