resolve conflicts dev 104