big init
fixed git ignore conflict