add responsive layout
resolve conflict