adding fourth
remove conflicts