fixed major merge bug
More merging