Removed consle log
Fixed tat merge conflix