[BUGFIX] Fixed wrong merge