initial commit
fixed git conflicts