Fix git conflicts, trying to submit