commit stuff before merge