New week update
Merger Errors Fixed