fixed few more minor merge conflict leftovers