init refactor push
stupid question mark
merge conflict fix?