got it to work
think it should have merged properly