giving some standard conventions love to code
Fixing merging conflicts