Cleanup conflicts