Improve style
 Fix Conflict