Maj install procedure
Conflict fixed