created first commit
fixed conflict