@fadel1493 resolve conflicts