fix siblings
syntax errors
messy merge