Add unlink button action
fix conflicts