update before pull
resolving merge problem