fixed forgotten merge conflict