Removed all Alert references
Fixed merge errors