resolving merge conflict after moving the hw directory