fixed Thruk merge