whats going on
resolving merge error