modify niremekko0813
solve conflict