fix last cancel button
fixing merge