fixed bugs and conflicts