fixing the remote tracking on checkout
fixing conflict