fixed conflict before fileapi