resolving merge error (?)