miras pc merge conflict because of IDEA version