resolving the other conflict too lol