Solved conflict packages