Remove inadvertantly checked in artifacts of merge conflict resolution