my modifications
Merge resolved