#31 Previous changes got dropped while splitting files