working_copies.location, fixed merge bug