Removed Conflict Files

Conflict files from syncing removed