fixed small merging error