Moure commit de branca i desfer merge