Fixed issues caused by fixing merging conflicts