slowly fixing git conflicts...