Fourth Commit
Fixed Conflicts