forgot log had a conflict, removed conflict by removing all the entries in the log