initial commit
initial merge error solved