Fixed bug and conflicts