fixed failed merges and unit test