Befor merge