fixed conflig completion
fixed non existent endif
made config completion work without path
merged back origin to account from ammends