Merge
Resolve Problems caused by merged