Fixing wrong merge