initial commit
fixed merge error