I haven't noticed a significant battery drain. I charge my one year old phone once a day. Merge conflicts aren't too bad, although I don't encounter them often. When there's a conflict there is a file for each version and it's easy enough to resolve.