First commit
Master added
Slave added
Conflict resolved