some js stuff
fixed merges