fix merged branch