merge implemented - still needs comments