resolving merge conficts with latest pull