merge branch

Some merge issues.