merge two action component bug fix