got one step passing now. merge seems to be going well