Fix helix2solv conflicts error