Deleted conflictive git file
Added new file
Fixed