Merges remote with origin