merged branch code