Complete Merge & correct problems