started checkstyling
resolved conflicts