small changes
some sample data
resovle merge conflict
resolve more merge conflict