checkstyle fixes
fixed conflict on merge for checkstyle fixes