Updated to actually resolve conflict rather than not