splitted some lines to avoid long lines
resolved conflicts