Fixed incorrect usage of delete
Registered the merge command, conflicts are now reported