Added changes before fetch/merge