Pull from the remote before merging in case you switched machines