add sample data
change layout
resolve merge conflict