Changing back to merge full change without conflict(?)