example: quick fix
format: changed indentation, merged branches