fixed bug with merged branch