fixed automerge fail and comments and bracket indentation