Added second check
resolved conflicts