add lines to ignore
merge dev