Resolving conflicts on my end, shouldn't affect anything