Writing description
Fixing conflict