Log Message: Fix conflicts during the merge (add files not imported properly). Hope this is the right way to go...