github conflicted copy test