Merge resolved an minor collision fix