Merged branch manually