Fix minor style bugs
Fix conflict