fix merge problems
merge problem resolved