merged conflictor and got rid of printlns