Resolved one last conflict