Pre update before pulling
post merge