resolve conflicts
dev