fixed merge, removed duplicate method