fixed the bug, now testing
 merged branches