Stablishing master partialy done
Solved conflicts