package lock json git conflict