Remove conflicting files from first branch.