Resolve bugs created in merge