corrected javascript bug
solve conflicts