Fixed mout folder
Fixing conflicts