- fixed a merge problem