Resolved issues with merge- merged functionality should be stable with master branch now