inital
config
local config
upstream merged
finishing merge
fixed merge
gitingore fix
attributes
fixes