resolve conflits
merge