Fixed conflicts

forgot to sync before making window stuff work and totally borked it
then fixsed it