d
fix merge errors
remove availability