before merge auto and master