Bugfixes with misc merger logic cases; also implement #36 (must be tested later)