merge functionality done. most tests and features running