Added some junk for merge conflict
Fixed merge conflict