fix design
fix design & resolve conflicts