Added md5 hashing
Fixed Conflicts