scrutinizer patch
code cleaning
resolve conflicts