fixes small merging error