Fixed conflict 2
Fixed Conflict 3
Fixed Conflicts 4 and 5