first commit
fixed the merging issue
fixed the merging issue
another commit