commiting example
merge resolved