changed some js for branching and merging