added stuff conflicts fixed