Conflicting files

Conflicting files removed