fix drill across merge
merge pauls more
finish merge